fix: validate Origin header on WebSocket /run_live endpoint#4951
Open
YouFoxGirl wants to merge 2 commits intogoogle:mainfrom
Open
fix: validate Origin header on WebSocket /run_live endpoint#4951YouFoxGirl wants to merge 2 commits intogoogle:mainfrom
YouFoxGirl wants to merge 2 commits intogoogle:mainfrom
Conversation
added 2 commits
March 22, 2026 10:30
Use except Exception: instead of bare except: in the live agent API sample.
WebSocket upgrades are not protected by CORS middleware, so any webpage could establish a WebSocket connection to the local ADK dev server and chain it with /builder/save to achieve RCE. The fix adds explicit Origin validation to the /run_live WebSocket handler: - When allow_origins is configured: accept only origins in the list or matching a regex pattern (consistent with CORS middleware behavior) - When allow_origins is not configured: accept only same-origin or no-Origin-header requests (non-browser clients), rejecting cross-origin Fixes google#4947
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4947
Summary
WebSocket upgrades are not protected by FastAPI's CORS middleware, so any webpage could establish a WebSocket connection to the local ADK dev server and chain it with
/builder/saveto achieve RCE.The fix adds explicit Origin validation to the
/run_liveWebSocket handler:allow_originsis configured: accept only origins in the list or matching a regex pattern (consistent with CORS middleware behavior)allow_originsis not configured: accept only same-origin or no-Origin-header requests (non-browser clients), rejecting cross-originChanges
adk_web_server.py: Parse and storeallow_originsat app creation time for WebSocket reuse/run_liveWebSocket handler: validateOriginheader before accepting the connection, close with code 1008 if rejectedSecurity Impact
Prevents CSRF-to-RCE attack chain where a malicious webpage could: upload a malicious
agent.pyvia/builder/save, create a session, and trigger code execution via WebSocket.Added 4 unit tests covering same-origin, cross-origin, configured origins, and unlisted origins.